Cgeek pullreq

Should fix #2 for your fork, thanks for finding the issue