v1.1
Merge pull request #1 from cfb95/master

v1.1