added contents from a
Merge pull request #1 from krlmlr/a

merge added contents from a