Merge pull request #5 from daniel-kun/master

Updated from master