Merge pull request #15 from joeyvandijk/master

v.1.2.4
v1.2.7