Merge pull request #3 from Orain/master

Update to position of Orain Fork (whitespace only merge, lol)
just solve the specific case, not the general one
Merge pull request #2 from labster/master

Fix 50% of the feature