bug fixes
more bug fixes
updated ASF
Merge pull request #2 from karlnordstrom/master

ASF update