Merge pull request #34 from apophis775/master

30NOV2014 Update