December 10th, 2014 #2
Merge pull request #3 from KBratland/master

December 10th, 2014 #2