Close #16

Test has been made on the following systems:

Ubuntu 12.10
Rosa Desktop Fresh (KDE)
Windows 7
Mac OSX Snow Leopard 10.6 running in Virtual Box