Fixed Bug 216
Merge branch 'bug-216'