BUGFIX
Merge branch 'master' of https://github.com/bDino/VS2013-2014