Amended a line missed in the merge.
Merge pull request #325 from sgiavasis/master

Amended a line missed in the merge.
Merge pull request #11 from FCP-INDI/master

Update 0.3.4 release branch with master changes again