updating circle [ci skip]
Merge branch 'dev' into master
Merge tag '0.1.2' [ci skip]
Merge branch 'dev' into 'master'
Merge tag 'rc20140915a' into 'master'
Merge branch 'master' into dev