Fixed Bug #103 by changing regular expression
Merge branch 'bugfix/103' into develop