Added support for single quotes
Merge branch 'tkallevik-master'