Merge pull request #490 from CoryChaplin/fixes
authorDarren <darren@darrenwhitlen.com>
Sun, 23 Feb 2014 21:03:23 +0000 (21:03 +0000)
committerDarren <darren@darrenwhitlen.com>
Sun, 23 Feb 2014 21:03:23 +0000 (21:03 +0000)
Fix for #489


Trivial merge