Merge pull request #186 from Aurorastation/development

Update 2, 20JUL2014
Merge pull request #188 from Aurorastation/development

Hotfix 20JUL2014
Merge pull request #1 from Aurorastation/master

unbork my fork