eliminated a very ugly while(true)
Merge branch 'master' of github.com:KanocX/Calendar