making it more RESTful
merging dev into master
merging master into github-master