Merge branch 'hotfix/20140122-issue-95' / close #95
Edit solution/define_classes
Merge branch 'hotfix/1390393672' into develop