Merge pull request #1 from trickerss/master

by patrick