israelidanny Merge pull request #33 from mauron85/issue#32