Merge pull request #11 from JRogaishio/dev

Pull dev branch into master
Code cleanup and version update
Updated login token references