Use moment instead of ugly haxx
Remove one file and refactor, acutally fixes issue #20
Merge branch 'develop'