Removed the tag stuff until Travis bug is fixed
Merge branch 'master' into develop