Fixed Issue #64 as mentioned in issue, complete solution isnt there yet