Fix much of issue #3 #7

Merged
merged 10 commits into from Dec 11, 2011

1 participant