Fix issue 21

Hello Coderholic,

I took sometime to "fix" issue 21 and I took the opportunity to remove the not responding stations.
Regards,

Laurent