Merge branch 'dev' into release-v0.2.4

setup.py

@@ -50,7 +50,10 @@ MINOR = 2
 MICRO = 4
 PRE = ""  # e.g. rc0, alpha.1, 0.beta-23
 ISRELEASED = True
-VERSION = "{}.{}.{}{}".format(MAJOR, MINOR, MICRO, PRE)
+if PRE:
+    VERSION = "{}.{}.{}-{}".format(MAJOR, MINOR, MICRO, PRE)
+else:
+    VERSION = "{}.{}.{}".format(MAJOR, MINOR, MICRO)
 
 
 # Return the git revision as a string