Bug #11 - Changed feature patch and implementation according to changes in Mars
Build 201412091906