Merge pull request #2 from c-mimms/master

Updating dev branch.