1.2.0
Merge pull request #55 from Randgalt/master

1.2.0