Merge pull request #1 from BigNoid/master

rebase