Resolved #19
Merge branch 'develop' of github.com:Artimi/waktu into develop