amiceli Merge branch 'master' of github.com:amiceli/beat.time into master