Merge pull request #55 from OneGet/wip

Pulling updates from work-in-progress branch
Merge branch 'master' of github.com:OneGet/oneget into wip