Merge branch 'master' of http://github.com/dvargo/common
Merge branch 'master' of http://github.com/dvargo/common
Merge branch 'master' of http://github.com/dvargo/common
updates