Merge pull request #56 from hrovira/master

merging minor changes and scripts