Merge pull request #2 from changbl/working

Several cosmetic fixes