bumped version 2.1.2-beta, remove stupid keyword tag
Merge branch 'develop'