Fixing small bugs
Merge branches 'master' and 'master' of https://github.com/kmills006/2013-04_MDD-2sided