20120407
* see `git log' for more recent change log
* Worked on stand-alone version

