Bug #6176
Feature #6178
Merge pull request #13 from apatel/master

redmine bugs