Small bits of updates, not much
Small updates
Merge pull request #11 from UAT-CS/master

Merge from master to dev