11/09/2014 - merge with development