Merge pull request #4 from trickortweak/master

Merge trickorweak