Merge pull request #107 from Vexatos/16working