Merged changes from apmuthu master
https://github.com/apmuthu/simpleinvoices/commit/452890c38dc449c7efc5aae610b29620825ce7ec
https://github.com/apmuthu/simpleinvoices/commit/ae00ec3b16c9ba7cd93072c6b55460dabbdd8e8e
https://github.com/apmuthu/simpleinvoices/commit/122e4f22b157cf7ce92fcb53e29046de14ef79b5
https://github.com/apmuthu/simpleinvoices/commit/6a1f33d31cdd476f3cb184deba00126f2f2c2133