Merge pull request #8 from hayer44/master

rebase