Merge pull request #16 from RARyan/RobMasterBranch

18-July-2014
Merge remote-tracking branch 'origin/master' into RobMasterBranch