Fixed annoying tail flipping!!!
Merged and made small tweaks.
Merge branch 'merge' into develop