Merge pull request #8 from Aurorastation/master

Branch Update 06JUN2014