Fixing hella stuff. Fixed #28
Merge remote-tracking branch 'origin'