Merge pull request #27 from tgrrtt/master

Major update from develop