Should resolve issue #13

Thanks @cheeseplus for the report for #13
Merge pull request #14 from jjasghar/update_apache_to_3

Should resolve issue #13