Modifications
Merge github.com:pharic/android_moment