Merge develop branch with master changes #57

Closed zsoltpardi closed 9 years ago