Merge Pull request #67 - Thanks @Ha99y