Update 03/2014

Update from bitbucket