Fixed NullPointerException detailed on https://gist.github.com/8840999ce18a346985dc
Merge pull request #1 from margge/develop

Fixed NullPointerException detailed on https://gist.github.com/8840999ce...
Added Git ignore
Merge remote-tracking branch 'origin/develop'