Fixed bug #1
Merge branch 'bugfix_1'