Make it complete - 20140220
Merge branch 'develop'