Few little changes...

Brilliant idea from http://stackoverflow.com/a/9891619