wip
Merge pull request #2 from theRemix/master

wip