Merge pull request #1 from Artwalk/master

rebase