Merge latest master changes with develop branch #56

Closed zsoltpardi closed 9 years ago